/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_emacs.idb / usr / freeware / share / emacs / 19.34 / lisp / ediff-vers.elc.z / ediff-vers.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 32 3a 33 32 20 31 39 39 | 17 15:4|2:32 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 76 65 |.0/lisp/|ediff-ve|
|00000080| 72 73 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |rs.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n)..    |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).|    (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 76 65 72 73 2e |or "`edi|ff-vers.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 09 42 11 c2 |byte-cod|e "..B..|
|000001f0| 09 42 11 c3 09 42 11 c4 | 09 42 11 c5 09 42 11 c0 |.B...B..|.B...B..|
|00000200| 87 22 20 5b 72 63 73 2d | 64 65 66 61 75 6c 74 2d |." [rcs-|default-|
|00000210| 63 6f 2d 73 77 69 74 63 | 68 65 73 20 63 75 72 72 |co-switc|hes curr|
|00000220| 65 6e 74 2d 6c 6f 61 64 | 2d 6c 69 73 74 20 73 63 |ent-load|-list sc|
|00000230| 2d 6d 6f 64 65 20 63 76 | 73 2d 73 68 65 6c 6c 20 |-mode cv|s-shell |
|00000240| 63 76 73 2d 70 72 6f 67 | 72 61 6d 20 63 76 73 2d |cvs-prog|ram cvs-|
|00000250| 63 6f 6f 6b 69 65 2d 68 | 61 6e 64 6c 65 5d 20 32 |cookie-h|andle] 2|
|00000260| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 76 63 2d |).(defal|ias 'vc-|
|00000270| 65 64 69 66 66 2d 69 6e | 74 65 72 6e 61 6c 20 23 |ediff-in|ternal #|
|00000280| 5b 28 72 65 76 31 20 72 | 65 76 32 20 26 6f 70 74 |[(rev1 r|ev2 &opt|
|00000290| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|000002a0| 6f 6b 73 29 20 22 c0 89 | 89 89 19 1a 1b 1c 8a c5 |oks) "..|........|
|000002b0| 0e 06 21 88 70 12 c7 20 | 14 29 8a 0e 08 c9 98 84 |..!.p.. |.)......|
|000002c0| 21 00 c5 0e 08 21 88 70 | 11 c7 20 13 29 ca c0 cb |!....!.p|.. .)...|
|000002d0| 5c 66 44 cc 0e 08 c9 98 | cb 0b 44 45 46 0e 0d 42 |\fD.....|..DEF..B|
|000002e0| 16 0d ce 5c 6e 09 0e 0d | cf 24 2c 87 22 20 5b 6e |...\n...|.$,." [n|
|000002f0| 69 6c 20 72 65 76 32 62 | 75 66 20 72 65 76 31 62 |il rev2b|uf rev1b|
|00000300| 75 66 20 66 69 6c 65 32 | 20 66 69 6c 65 31 20 76 |uf file2| file1 v|
|00000310| 63 2d 76 65 72 73 69 6f | 6e 2d 6f 74 68 65 72 2d |c-versio|n-other-|
|00000320| 77 69 6e 64 6f 77 20 72 | 65 76 31 20 62 75 66 66 |window r|ev1 buff|
|00000330| 65 72 2d 66 69 6c 65 2d | 6e 61 6d 65 20 72 65 76 |er-file-|name rev|
|00000340| 32 20 22 22 20 6c 61 6d | 62 64 61 20 64 65 6c 65 |2 "" lam|bda dele|
|00000350| 74 65 2d 66 69 6c 65 20 | 6f 72 20 73 74 61 72 74 |te-file |or start|
|00000360| 75 70 2d 68 6f 6f 6b 73 | 20 65 64 69 66 66 2d 62 |up-hooks| ediff-b|
|00000370| 75 66 66 65 72 73 20 65 | 64 69 66 66 2d 72 65 76 |uffers e|diff-rev|
|00000380| 69 73 69 6f 6e 5d 20 37 | 5d 29 0a 28 64 65 66 61 |ision] 7|]).(defa|
|00000390| 6c 69 61 73 20 27 72 63 | 73 2d 65 64 69 66 66 2d |lias 'rc|s-ediff-|
|000003a0| 76 69 65 77 2d 72 65 76 | 69 73 69 6f 6e 20 23 5b |view-rev|ision #[|
|000003b0| 28 26 6f 70 74 69 6f 6e | 61 6c 20 72 65 76 29 20 |(&option|al rev) |
|000003c0| 22 c0 70 21 19 c2 c3 5c | 66 85 0e 00 c5 5c 66 50 |".p!...\|f....\fP|
|000003d0| 43 5c 22 1e 06 c7 09 21 | c8 5c 66 c9 52 1e 5c 6e |C\"....!|.\f.R.\n|
|000003e0| cb cc 21 88 cd 09 21 11 | 0e 5c 6e 90 ce 09 0e 5c |..!...!.|.\n....\|
|000003f0| 6e 5c 22 1e 0f d0 0e 0f | 21 88 8a 0e 0f 71 88 d1 |n\".....|!....q..|
|00000400| d2 d3 d4 d5 d4 c2 0e 06 | 0e 16 d7 09 44 23 26 06 |........|....D#&.|
|00000410| 88 2a cb d8 21 88 0e 5c | 6e 91 2b 87 22 20 5b 62 |.*..!..\|n.+." [b|
|00000420| 75 66 66 65 72 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |uffer-fi|le-name |
|00000430| 66 69 6c 65 6e 61 6d 65 | 20 61 70 70 65 6e 64 20 |filename| append |
|00000440| 28 22 2d 70 22 29 20 72 | 65 76 20 22 2d 72 22 20 |("-p") r|ev "-r" |
|00000450| 73 77 69 74 63 68 65 73 | 20 66 69 6c 65 2d 6e 61 |switches| file-na|
|00000460| 6d 65 2d 6e 6f 6e 64 69 | 72 65 63 74 6f 72 79 20 |me-nondi|rectory |
|00000470| 22 2e 7e 22 20 22 7e 22 | 20 62 75 66 66 20 6d 65 |".~" "~"| buff me|
|00000480| 73 73 61 67 65 20 22 57 | 6f 72 6b 69 6e 67 20 2e |ssage "W|orking .|
|00000490| 2e 2e 22 20 65 78 70 61 | 6e 64 2d 66 69 6c 65 2d |.." expa|nd-file-|
|000004a0| 6e 61 6d 65 20 65 64 69 | 66 66 2d 72 63 73 2d 67 |name edi|ff-rcs-g|
|000004b0| 65 74 2d 6f 75 74 70 75 | 74 2d 62 75 66 66 65 72 |et-outpu|t-buffer|
|000004c0| 20 6f 75 74 70 75 74 2d | 62 75 66 66 65 72 20 64 | output-|buffer d|
|000004d0| 65 6c 65 74 65 2d 77 69 | 6e 64 6f 77 73 2d 6f 6e |elete-wi|ndows-on|
|000004e0| 20 61 70 70 6c 79 20 63 | 61 6c 6c 2d 70 72 6f 63 | apply c|all-proc|
|000004f0| 65 73 73 20 22 63 6f 22 | 20 6e 69 6c 20 74 20 72 |ess "co"| nil t r|
|00000500| 63 73 2d 64 65 66 61 75 | 6c 74 2d 63 6f 2d 73 77 |cs-defau|lt-co-sw|
|00000510| 69 74 63 68 65 73 20 22 | 2d 71 22 20 22 22 5d 20 |itches "|-q" ""] |
|00000520| 31 32 20 6e 69 6c 20 28 | 6c 69 73 74 20 28 69 66 |12 nil (|list (if|
|00000530| 20 63 75 72 72 65 6e 74 | 2d 70 72 65 66 69 78 2d | current|-prefix-|
|00000540| 61 72 67 20 28 72 65 61 | 64 2d 73 74 72 69 6e 67 |arg (rea|d-string|
|00000550| 20 22 52 65 76 69 73 69 | 6f 6e 3a 20 22 29 29 29 | "Revisi|on: ")))|
|00000560| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00000570| 69 66 66 2d 72 63 73 2d | 67 65 74 2d 6f 75 74 70 |iff-rcs-|get-outp|
|00000580| 75 74 2d 62 75 66 66 65 | 72 20 23 5b 28 66 69 6c |ut-buffe|r #[(fil|
|00000590| 65 20 6e 61 6d 65 29 20 | 22 c0 19 c2 0b 21 1c 8a |e name) |"....!..|
|000005a0| 5c 66 71 88 c5 16 06 c7 | c8 0e 09 21 21 16 5c 6e |\fq.....|...!!.\n|
|000005b0| cb 20 88 29 5c 66 2a 87 | 22 20 5b 66 75 6e 64 61 |. .)\f*.|" [funda|
|000005c0| 6d 65 6e 74 61 6c 2d 6d | 6f 64 65 20 64 65 66 61 |mental-m|ode defa|
|000005d0| 75 6c 74 2d 6d 61 6a 6f | 72 2d 6d 6f 64 65 20 67 |ult-majo|r-mode g|
|000005e0| 65 74 2d 62 75 66 66 65 | 72 2d 63 72 65 61 74 65 |et-buffe|r-create|
|000005f0| 20 6e 61 6d 65 20 62 75 | 66 20 6e 69 6c 20 62 75 | name bu|f nil bu|
|00000600| 66 66 65 72 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 66 |ffer-rea|d-only f|
|00000610| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|00000620| 72 79 20 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |ry expan|d-file-n|
|00000630| 61 6d 65 20 66 69 6c 65 | 20 64 65 66 61 75 6c 74 |ame file| default|
|00000640| 2d 64 69 72 65 63 74 6f | 72 79 20 65 72 61 73 65 |-directo|ry erase|
|00000650| 2d 62 75 66 66 65 72 5d | 20 33 5d 29 0a 28 64 65 |-buffer]| 3]).(de|
|00000660| 66 61 6c 69 61 73 20 27 | 72 63 73 2d 65 64 69 66 |falias '|rcs-edif|
|00000670| 66 2d 69 6e 74 65 72 6e | 61 6c 20 23 5b 28 72 65 |f-intern|al #[(re|
|00000680| 76 31 20 72 65 76 32 20 | 26 6f 70 74 69 6f 6e 61 |v1 rev2 |&optiona|
|00000690| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 29 |l startu|p-hooks)|
|000006a0| 20 22 08 c1 98 83 5c 6e | 00 70 82 0d 00 c2 08 21 | "....\n|.p.....!|
|000006b0| c2 0b 21 1c 1d c6 5c 66 | 0d 0e 07 c8 24 2a 87 22 |..!...\f|....$*."|
|000006c0| 20 5b 72 65 76 32 20 22 | 22 20 72 63 73 2d 65 64 | [rev2 "|" rcs-ed|
|000006d0| 69 66 66 2d 76 69 65 77 | 2d 72 65 76 69 73 69 6f |iff-view|-revisio|
|000006e0| 6e 20 72 65 76 31 20 72 | 65 76 31 62 75 66 20 72 |n rev1 r|ev1buf r|
|000006f0| 65 76 32 62 75 66 20 65 | 64 69 66 66 2d 62 75 66 |ev2buf e|diff-buf|
|00000700| 66 65 72 73 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |fers sta|rtup-hoo|
|00000710| 6b 73 20 65 64 69 66 66 | 2d 72 65 76 69 73 69 6f |ks ediff|-revisio|
|00000720| 6e 5d 20 35 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |n] 5]).(|defalias|
|00000730| 20 27 67 65 6e 65 72 69 | 63 2d 73 63 2d 67 65 74 | 'generi|c-sc-get|
|00000740| 2d 6c 61 74 65 73 74 2d | 72 65 76 20 23 5b 6e 69 |-latest-|rev #[ni|
|00000750| 6c 20 22 08 c1 3d 83 5c | 6e 00 c2 c3 21 87 c2 c4 |l "..=.\|n...!...|
|00000760| 21 87 22 20 5b 73 63 2d | 6d 6f 64 65 20 43 43 41 |!." [sc-|mode CCA|
|00000770| 53 45 20 65 76 61 6c 20 | 22 6d 61 69 6e 2f 4c 41 |SE eval |"main/LA|
|00000780| 54 45 53 54 22 20 22 22 | 5d 20 32 5d 29 0a 28 64 |TEST" ""|] 2]).(d|
|00000790| 65 66 61 6c 69 61 73 20 | 27 67 65 6e 65 72 69 63 |efalias |'generic|
|000007a0| 2d 73 63 2d 65 64 69 66 | 66 2d 69 6e 74 65 72 6e |-sc-edif|f-intern|
|000007b0| 61 6c 20 23 5b 28 72 65 | 76 31 20 72 65 76 32 20 |al #[(re|v1 rev2 |
|000007c0| 26 6f 70 74 69 6f 6e 61 | 6c 20 73 74 61 72 74 75 |&optiona|l startu|
|000007d0| 70 2d 68 6f 6f 6b 73 29 | 20 22 c0 89 19 1a 8a 0b |p-hooks)| "......|
|000007e0| 83 0f 00 0b c4 98 83 12 | 00 c5 20 13 c6 0b 21 88 |........|.. ...!.|
|000007f0| 70 12 29 8a 0e 07 c4 98 | 84 26 00 c6 0e 07 21 88 |p.).....|.&....!.|
|00000800| 70 11 29 c8 5c 6e 09 0e | 09 ca 24 2a 87 22 20 5b |p.).\n..|..$*." [|
|00000810| 6e 69 6c 20 72 65 76 32 | 62 75 66 20 72 65 76 31 |nil rev2|buf rev1|
|00000820| 62 75 66 20 72 65 76 31 | 20 22 22 20 67 65 6e 65 |buf rev1| "" gene|
|00000830| 72 69 63 2d 73 63 2d 67 | 65 74 2d 6c 61 74 65 73 |ric-sc-g|et-lates|
|00000840| 74 2d 72 65 76 20 73 63 | 2d 76 69 73 69 74 2d 70 |t-rev sc|-visit-p|
|00000850| 72 65 76 69 6f 75 73 2d | 72 65 76 69 73 69 6f 6e |revious-|revision|
|00000860| 20 72 65 76 32 20 65 64 | 69 66 66 2d 62 75 66 66 | rev2 ed|iff-buff|
|00000870| 65 72 73 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |ers star|tup-hook|
|00000880| 73 20 65 64 69 66 66 2d | 72 65 76 69 73 69 6f 6e |s ediff-|revision|
|00000890| 5d 20 35 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 5]).(d|efalias |
|000008a0| 27 76 63 2d 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |'vc-edif|f-merge-|
|000008b0| 69 6e 74 65 72 6e 61 6c | 20 23 5b 28 72 65 76 31 |internal| #[(rev1|
|000008c0| 20 72 65 76 32 20 61 6e | 63 65 73 74 6f 72 2d 72 | rev2 an|cestor-r|
|000008d0| 65 76 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |ev &opti|onal sta|
|000008e0| 72 74 75 70 2d 68 6f 6f | 6b 73 29 20 22 c0 89 89 |rtup-hoo|ks) "...|
|000008f0| 19 1a 1b 8a c4 0d 21 88 | 70 13 29 8a 0e 06 c7 98 |......!.|p.).....|
|00000900| 84 1b 00 c4 0e 06 21 88 | 70 12 29 0e 08 83 33 00 |......!.|p.)...3.|
|00000910| 8a 0e 08 c7 98 84 30 00 | c4 0e 08 21 88 70 11 29 |......0.|...!.p.)|
|00000920| c9 c0 ca cb 0b 21 44 cc | 0e 06 c7 98 ca cb 5c 6e |.....!D.|......\n|
|00000930| 21 44 45 cc 0e 08 c7 98 | 0e 08 3f ca cb 09 21 44 |!DE.....|..?...!D|
|00000940| 46 af 05 0e 0d 42 16 0d | 0e 08 83 6a 00 ce 0b 5c |F....B..|...j...\|
|00000950| 6e 09 0e 0d cf 25 82 71 | 00 d0 0b 5c 6e 0e 0d d1 |n....%.q|...\n...|
|00000960| 24 2b 87 22 20 5b 6e 69 | 6c 20 61 6e 63 65 73 74 |$+." [ni|l ancest|
|00000970| 6f 72 2d 62 75 66 20 62 | 75 66 32 20 62 75 66 31 |or-buf b|uf2 buf1|
|00000980| 20 76 63 2d 76 65 72 73 | 69 6f 6e 2d 6f 74 68 65 | vc-vers|ion-othe|
|00000990| 72 2d 77 69 6e 64 6f 77 | 20 72 65 76 31 20 72 65 |r-window| rev1 re|
|000009a0| 76 32 20 22 22 20 61 6e | 63 65 73 74 6f 72 2d 72 |v2 "" an|cestor-r|
|000009b0| 65 76 20 6c 61 6d 62 64 | 61 20 64 65 6c 65 74 65 |ev lambd|a delete|
|000009c0| 2d 66 69 6c 65 20 62 75 | 66 66 65 72 2d 66 69 6c |-file bu|ffer-fil|
|000009d0| 65 2d 6e 61 6d 65 20 6f | 72 20 73 74 61 72 74 75 |e-name o|r startu|
|000009e0| 70 2d 68 6f 6f 6b 73 20 | 65 64 69 66 66 2d 6d 65 |p-hooks |ediff-me|
|000009f0| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|00000a00| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00000a10| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00000a20| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00000a30| 69 66 66 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |iff-merg|e-buffer|
|00000a40| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |s ediff-|merge-re|
|00000a50| 76 69 73 69 6f 6e 73 5d | 20 31 30 5d 29 0a 28 64 |visions]| 10]).(d|
|00000a60| 65 66 61 6c 69 61 73 20 | 27 72 63 73 2d 65 64 69 |efalias |'rcs-edi|
|00000a70| 66 66 2d 6d 65 72 67 65 | 2d 69 6e 74 65 72 6e 61 |ff-merge|-interna|
|00000a80| 6c 20 23 5b 28 72 65 76 | 31 20 72 65 76 32 20 61 |l #[(rev|1 rev2 a|
|00000a90| 6e 63 65 73 74 6f 72 2d | 72 65 76 20 26 6f 70 74 |ncestor-|rev &opt|
|00000aa0| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00000ab0| 6f 6b 73 29 20 22 c0 89 | 89 19 1a 1b c4 0d 21 13 |oks) "..|......!.|
|00000ac0| 0e 06 c7 98 83 15 00 70 | 82 19 00 c4 0e 06 21 12 |.......p|......!.|
|00000ad0| 0e 08 85 2e 00 0e 08 c7 | 98 83 2a 00 70 82 2e 00 |........|..*.p...|
|00000ae0| c4 0e 08 21 11 0e 08 83 | 3f 00 c9 0b 5c 6e 09 0e |...!....|?...\n..|
|00000af0| 5c 6e cb 25 82 46 00 cc | 0b 5c 6e 0e 5c 6e cd 24 |\n.%.F..|.\n.\n.$|
|00000b00| 2b 87 22 20 5b 6e 69 6c | 20 61 6e 63 65 73 74 6f |+." [nil| ancesto|
|00000b10| 72 2d 62 75 66 20 62 75 | 66 32 20 62 75 66 31 20 |r-buf bu|f2 buf1 |
|00000b20| 72 63 73 2d 65 64 69 66 | 66 2d 76 69 65 77 2d 72 |rcs-edif|f-view-r|
|00000b30| 65 76 69 73 69 6f 6e 20 | 72 65 76 31 20 72 65 76 |evision |rev1 rev|
|00000b40| 32 20 22 22 20 61 6e 63 | 65 73 74 6f 72 2d 72 65 |2 "" anc|estor-re|
|00000b50| 76 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |v ediff-|merge-bu|
|00000b60| 66 66 65 72 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |ffers-wi|th-ances|
|00000b70| 74 6f 72 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |tor star|tup-hook|
|00000b80| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |s ediff-|merge-re|
|00000b90| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00000ba0| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 6d 65 72 67 |estor ed|iff-merg|
|00000bb0| 65 2d 62 75 66 66 65 72 | 73 20 65 64 69 66 66 2d |e-buffer|s ediff-|
|00000bc0| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 5d |merge-re|visions]|
|00000bd0| 20 36 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 6]).(de|falias '|
|00000be0| 67 65 6e 65 72 69 63 2d | 73 63 2d 65 64 69 66 66 |generic-|sc-ediff|
|00000bf0| 2d 6d 65 72 67 65 2d 69 | 6e 74 65 72 6e 61 6c 20 |-merge-i|nternal |
|00000c00| 23 5b 28 72 65 76 31 20 | 72 65 76 32 20 61 6e 63 |#[(rev1 |rev2 anc|
|00000c10| 65 73 74 6f 72 2d 72 65 | 76 20 26 6f 70 74 69 6f |estor-re|v &optio|
|00000c20| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00000c30| 73 29 20 22 c0 89 89 19 | 1a 1b 8a 5c 66 c5 98 83 |s) "....|...\f...|
|00000c40| 10 00 c6 20 14 c7 5c 66 | 21 88 70 13 29 8a 0e 08 |... ..\f|!.p.)...|
|00000c50| c5 98 84 24 00 c7 0e 08 | 21 88 70 12 29 0e 09 83 |...$....|!.p.)...|
|00000c60| 3c 00 8a 0e 09 c5 98 84 | 39 00 c7 0e 09 21 88 70 |<.......|9....!.p|
|00000c70| 11 29 0e 09 83 4c 00 ca | 0b 5c 6e 09 0e 0b cc 25 |.)...L..|.\n....%|
|00000c80| 82 53 00 cd 0b 5c 6e 0e | 0b ce 24 2b 87 22 20 5b |.S...\n.|..$+." [|
|00000c90| 6e 69 6c 20 61 6e 63 65 | 73 74 6f 72 2d 62 75 66 |nil ance|stor-buf|
|00000ca0| 20 62 75 66 32 20 62 75 | 66 31 20 72 65 76 31 20 | buf2 bu|f1 rev1 |
|00000cb0| 22 22 20 67 65 6e 65 72 | 69 63 2d 73 63 2d 67 65 |"" gener|ic-sc-ge|
|00000cc0| 74 2d 6c 61 74 65 73 74 | 2d 72 65 76 20 73 63 2d |t-latest|-rev sc-|
|00000cd0| 76 69 73 69 74 2d 70 72 | 65 76 69 6f 75 73 2d 72 |visit-pr|evious-r|
|00000ce0| 65 76 69 73 69 6f 6e 20 | 72 65 76 32 20 61 6e 63 |evision |rev2 anc|
|00000cf0| 65 73 74 6f 72 2d 72 65 | 76 20 65 64 69 66 66 2d |estor-re|v ediff-|
|00000d00| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 2d 77 69 |merge-bu|ffers-wi|
|00000d10| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 73 74 61 72 |th-ances|tor star|
|00000d20| 74 75 70 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |tup-hook|s ediff-|
|00000d30| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00000d40| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00000d50| 69 66 66 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |iff-merg|e-buffer|
|00000d60| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |s ediff-|merge-re|
|00000d70| 76 69 73 69 6f 6e 73 5d | 20 36 5d 29 0a 28 64 65 |visions]| 6]).(de|
|00000d80| 66 61 6c 69 61 73 20 27 | 70 63 6c 2d 63 76 73 2d |falias '|pcl-cvs-|
|00000d90| 65 64 69 66 66 2d 69 6e | 74 65 72 6e 61 6c 20 23 |ediff-in|ternal #|
|00000da0| 5b 28 72 65 76 31 20 72 | 65 76 32 20 26 6f 70 74 |[(rev1 r|ev2 &opt|
|00000db0| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00000dc0| 6f 6b 73 29 20 22 70 c0 | 89 89 89 89 19 1a 1b 1c |oks) "p.|........|
|00000dd0| 1d 1e 06 c7 70 21 89 15 | 84 19 00 c8 c9 21 88 0e |....p!..|.....!..|
|00000de0| 5c 6e cb 98 83 23 00 c0 | 16 5c 6e cc 0d 0e 5c 6e |\n...#..|.\n...\n|
|00000df0| 5c 22 14 0e 0d cb 98 83 | 35 00 0e 06 82 3a 00 cc |\"......|5....:..|
|00000e00| 0d 0e 0d 5c 22 13 c7 5c | 66 21 12 c7 0b 21 11 ce |...\"..\|f!...!..|
|00000e10| c0 cf 5c 6e 44 d0 0e 0d | cb 98 cf 09 44 45 46 0e |..\nD...|....DEF.|
|00000e20| 11 42 16 11 d2 5c 66 0b | 0e 11 d3 24 2e 06 87 22 |.B...\f.|...$..."|
|00000e30| 20 5b 6e 69 6c 20 66 69 | 6c 65 32 20 66 69 6c 65 | [nil fi|le2 file|
|00000e40| 31 20 62 75 66 32 20 62 | 75 66 31 20 6f 72 69 67 |1 buf2 b|uf1 orig|
|00000e50| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 6f 72 69 67 2d |-file-na|me orig-|
|00000e60| 62 75 66 20 62 75 66 66 | 65 72 2d 66 69 6c 65 2d |buf buff|er-file-|
|00000e70| 6e 61 6d 65 20 65 72 72 | 6f 72 20 22 43 75 72 72 |name err|or "Curr|
|00000e80| 65 6e 74 20 62 75 66 66 | 65 72 20 69 73 20 6e 6f |ent buff|er is no|
|00000e90| 74 20 76 69 73 69 74 69 | 6e 67 20 61 6e 79 20 66 |t visiti|ng any f|
|00000ea0| 69 6c 65 22 20 72 65 76 | 31 20 22 22 20 65 64 69 |ile" rev|1 "" edi|
|00000eb0| 66 66 2d 70 63 6c 2d 63 | 76 73 2d 76 69 65 77 2d |ff-pcl-c|vs-view-|
|00000ec0| 72 65 76 69 73 69 6f 6e | 20 72 65 76 32 20 6c 61 |revision| rev2 la|
|00000ed0| 6d 62 64 61 20 64 65 6c | 65 74 65 2d 66 69 6c 65 |mbda del|ete-file|
|00000ee0| 20 6f 72 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b | or star|tup-hook|
|00000ef0| 73 20 65 64 69 66 66 2d | 62 75 66 66 65 72 73 20 |s ediff-|buffers |
|00000f00| 65 64 69 66 66 2d 72 65 | 76 69 73 69 6f 6e 5d 20 |ediff-re|vision] |
|00000f10| 37 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 70 |7]).(def|alias 'p|
|00000f20| 63 6c 2d 63 76 73 2d 65 | 64 69 66 66 2d 6d 65 72 |cl-cvs-e|diff-mer|
|00000f30| 67 65 2d 69 6e 74 65 72 | 6e 61 6c 20 23 5b 28 72 |ge-inter|nal #[(r|
|00000f40| 65 76 31 20 72 65 76 32 | 20 61 6e 63 65 73 74 6f |ev1 rev2| ancesto|
|00000f50| 72 2d 72 65 76 20 26 6f | 70 74 69 6f 6e 61 6c 20 |r-rev &o|ptional |
|00000f60| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 29 20 22 |startup-|hooks) "|
|00000f70| 70 c0 89 89 89 19 1a 1b | 1c 1d c6 70 21 89 14 84 |p.......|...p!...|
|00000f80| 16 00 c7 c8 21 88 0e 09 | ca 98 83 20 00 c0 16 09 |....!...|... ....|
|00000f90| cb 5c 66 0e 09 5c 22 13 | 0e 5c 66 ca 98 83 31 00 |.\f..\".|.\f...1.|
|00000fa0| 0d 82 36 00 cb 5c 66 0e | 5c 66 5c 22 12 0e 0d 3b |..6..\f.|\f\"...;|
|00000fb0| 83 4e 00 0e 0d ca 98 83 | 48 00 0d 82 4d 00 cb 5c |.N......|H...M..\|
|00000fc0| 66 0e 0d 5c 22 11 ce c0 | cf c6 0b 21 44 d0 0e 5c |f..\"...|...!D..\|
|00000fd0| 66 ca 98 cf c6 5c 6e 21 | 44 45 d0 0e 0d ca 98 0e |f....\n!|DE......|
|00000fe0| 0d 3f cf c6 09 21 44 46 | af 05 0e 11 42 16 11 09 |.?...!DF|....B...|
|00000ff0| 83 84 00 d2 0b 5c 6e 09 | 0e 11 d3 25 82 8b 00 d4 |.....\n.|...%....|
|00001000| 0b 5c 6e 0e 11 d5 24 2d | 87 22 20 5b 6e 69 6c 20 |.\n...$-|." [nil |
|00001010| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 20 62 75 66 |ancestor|-buf buf|
|00001020| 32 20 62 75 66 31 20 6f | 72 69 67 2d 66 69 6c 65 |2 buf1 o|rig-file|
|00001030| 2d 6e 61 6d 65 20 6f 72 | 69 67 2d 62 75 66 20 62 |-name or|ig-buf b|
|00001040| 75 66 66 65 72 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |uffer-fi|le-name |
|00001050| 65 72 72 6f 72 20 22 43 | 75 72 72 65 6e 74 20 62 |error "C|urrent b|
|00001060| 75 66 66 65 72 20 69 73 | 20 6e 6f 74 20 76 69 73 |uffer is| not vis|
|00001070| 69 74 69 6e 67 20 61 6e | 79 20 66 69 6c 65 22 20 |iting an|y file" |
|00001080| 72 65 76 31 20 22 22 20 | 65 64 69 66 66 2d 70 63 |rev1 "" |ediff-pc|
|00001090| 6c 2d 63 76 73 2d 76 69 | 65 77 2d 72 65 76 69 73 |l-cvs-vi|ew-revis|
|000010a0| 69 6f 6e 20 72 65 76 32 | 20 61 6e 63 65 73 74 6f |ion rev2| ancesto|
|000010b0| 72 2d 72 65 76 20 6c 61 | 6d 62 64 61 20 64 65 6c |r-rev la|mbda del|
|000010c0| 65 74 65 2d 66 69 6c 65 | 20 6f 72 20 73 74 61 72 |ete-file| or star|
|000010d0| 74 75 70 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |tup-hook|s ediff-|
|000010e0| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 2d 77 69 |merge-bu|ffers-wi|
|000010f0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00001100| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|00001110| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00001120| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 62 75 66 66 |ediff-me|rge-buff|
|00001130| 65 72 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ers edif|f-merge-|
|00001140| 72 65 76 69 73 69 6f 6e | 73 5d 20 31 30 5d 29 0a |revision|s] 10]).|
|00001150| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00001160| 2d 70 63 6c 2d 63 76 73 | 2d 76 69 65 77 2d 72 65 |-pcl-cvs|-view-re|
|00001170| 76 69 73 69 6f 6e 20 23 | 5b 28 66 69 6c 65 20 72 |vision #|[(file r|
|00001180| 65 76 29 20 22 c0 09 c2 | 0b 51 21 1c c5 5c 66 21 |ev) "...|.Q!..\f!|
|00001190| 88 0b 83 17 00 c6 c7 0b | 5c 22 88 82 1b 00 c6 c8 |........|\"......|
|000011a0| 21 88 c9 0e 5c 6e cb 89 | 89 cc 0e 0d ce 0b 83 30 |!...\n..|.......0|
|000011b0| 00 cf 0b d0 51 82 31 00 | d1 0e 12 d3 5c 66 b0 06 |....Q.1.|....\f..|
|000011c0| 26 06 89 1e 14 83 52 00 | 0e 14 a8 83 4c 00 0e 14 |&.....R.|....L...|
|000011d0| d5 55 84 52 00 d6 d7 0e | 14 5c 22 88 0b 83 5e 00 |.U.R....|.\"...^.|
|000011e0| c6 d8 0b 5c 22 88 82 62 | 00 c6 d9 21 88 da 5c 66 |...\"..b|...!..\f|
|000011f0| 21 2a 87 22 20 5b 6d 61 | 6b 65 2d 74 65 6d 70 2d |!*." [ma|ke-temp-|
|00001200| 6e 61 6d 65 20 65 64 69 | 66 66 2d 74 65 6d 70 2d |name edi|ff-temp-|
|00001210| 66 69 6c 65 2d 70 72 65 | 66 69 78 20 22 65 64 69 |file-pre|fix "edi|
|00001220| 66 66 5f 22 20 72 65 76 | 20 74 65 6d 70 2d 6e 61 |ff_" rev| temp-na|
|00001230| 6d 65 20 63 76 73 2d 6b | 69 6c 6c 2d 62 75 66 66 |me cvs-k|ill-buff|
|00001240| 65 72 2d 76 69 73 69 74 | 69 6e 67 20 6d 65 73 73 |er-visit|ing mess|
|00001250| 61 67 65 20 22 52 65 74 | 72 69 65 76 69 6e 67 20 |age "Ret|rieving |
|00001260| 72 65 76 69 73 69 6f 6e | 20 25 73 2e 2e 2e 22 20 |revision| %s..." |
|00001270| 22 52 65 74 72 69 65 76 | 69 6e 67 20 6c 61 74 65 |"Retriev|ing late|
|00001280| 73 74 20 72 65 76 69 73 | 69 6f 6e 2e 2e 2e 22 20 |st revis|ion..." |
|00001290| 63 61 6c 6c 2d 70 72 6f | 63 65 73 73 20 63 76 73 |call-pro|cess cvs|
|000012a0| 2d 73 68 65 6c 6c 20 6e | 69 6c 20 22 2d 63 22 20 |-shell n|il "-c" |
|000012b0| 63 76 73 2d 70 72 6f 67 | 72 61 6d 20 22 20 75 70 |cvs-prog|ram " up|
|000012c0| 64 61 74 65 20 2d 70 20 | 22 20 22 2d 72 20 22 20 |date -p |" "-r " |
|000012d0| 22 20 22 20 22 22 20 66 | 69 6c 65 20 22 20 3e 20 |" " "" f|ile " > |
|000012e0| 22 20 72 65 73 20 30 20 | 65 72 72 6f 72 20 22 46 |" res 0 |error "F|
|000012f0| 61 69 6c 65 64 20 74 6f | 20 72 65 74 72 69 65 76 |ailed to| retriev|
|00001300| 65 20 72 65 76 69 73 69 | 6f 6e 3a 20 25 73 22 20 |e revisi|on: %s" |
|00001310| 22 52 65 74 72 69 65 76 | 69 6e 67 20 72 65 76 69 |"Retriev|ing revi|
|00001320| 73 69 6f 6e 20 25 73 2e | 2e 2e 20 44 6f 6e 65 2e |sion %s.|.. Done.|
|00001330| 22 20 22 52 65 74 72 69 | 65 76 69 6e 67 20 6c 61 |" "Retri|eving la|
|00001340| 74 65 73 74 20 72 65 76 | 69 73 69 6f 6e 2e 2e 2e |test rev|ision...|
|00001350| 20 44 6f 6e 65 2e 22 20 | 66 69 6e 64 2d 66 69 6c | Done." |find-fil|
|00001360| 65 2d 6e 6f 73 65 6c 65 | 63 74 5d 20 31 33 5d 29 |e-nosele|ct] 13])|
|00001370| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 63 76 73 2d |.(defali|as 'cvs-|
|00001380| 72 75 6e 2d 65 64 69 66 | 66 2d 6f 6e 2d 66 69 6c |run-edif|f-on-fil|
|00001390| 65 2d 64 65 73 63 72 69 | 70 74 6f 72 20 23 5b 28 |e-descri|ptor #[(|
|000013a0| 74 69 6e 29 20 22 c0 09 | 5c 6e 5c 22 1b c4 0b 21 |tin) "..|\n\"...!|
|000013b0| 1d c6 0b 21 1e 07 c8 1e | 09 0d ca 3e 84 1b 00 cb |...!....|...>....|
|000013c0| cc 21 88 0d cd 3e 83 3e | 00 c6 0b ce 0b 21 5c 22 |.!...>.>|.....!\"|
|000013d0| 16 09 cf d0 0e 07 21 d0 | d1 0b 21 21 d0 0e 09 21 |......!.|..!!...!|
|000013e0| c8 d2 25 88 82 52 00 0d | d3 3d 83 52 00 d4 d0 0e |..%..R..|.=.R....|
|000013f0| 07 21 d0 d5 0b 21 21 c8 | d6 24 88 0e 07 3b 83 5d |.!...!!.|.$...;.]|
|00001400| 00 d7 0e 07 21 88 0e 09 | 3b 85 67 00 d7 0e 09 21 |....!...|;.g....!|
|00001410| 2c 87 22 20 5b 74 69 6e | 2d 63 6f 6f 6b 69 65 20 |,." [tin|-cookie |
|00001420| 63 76 73 2d 63 6f 6f 6b | 69 65 2d 68 61 6e 64 6c |cvs-cook|ie-handl|
|00001430| 65 20 74 69 6e 20 66 69 | 6c 65 69 6e 66 6f 20 63 |e tin fi|leinfo c|
|00001440| 76 73 2d 66 69 6c 65 69 | 6e 66 6f 2d 3e 74 79 70 |vs-filei|nfo->typ|
|00001450| 65 20 74 79 70 65 20 63 | 76 73 2d 72 65 74 72 69 |e type c|vs-retri|
|00001460| 65 76 65 2d 72 65 76 69 | 73 69 6f 6e 2d 74 6f 2d |eve-revi|sion-to-|
|00001470| 74 6d 70 66 69 6c 65 20 | 74 6d 70 2d 66 69 6c 65 |tmpfile |tmp-file|
|00001480| 20 6e 69 6c 20 61 6e 63 | 65 73 74 6f 72 2d 66 69 | nil anc|estor-fi|
|00001490| 6c 65 20 28 4d 45 52 47 | 45 44 20 43 4f 4e 46 4c |le (MERG|ED CONFL|
|000014a0| 49 43 54 20 4d 4f 44 49 | 46 49 45 44 29 20 65 72 |ICT MODI|FIED) er|
|000014b0| 72 6f 72 20 22 43 61 6e | 20 6f 6e 6c 79 20 6d 65 |ror "Can| only me|
|000014c0| 72 67 65 20 60 4d 6f 64 | 69 66 69 65 64 27 2c 20 |rge `Mod|ified', |
|000014d0| 60 4d 65 72 67 65 64 27 | 20 6f 72 20 60 43 6f 6e |`Merged'| or `Con|
|000014e0| 66 6c 69 63 74 27 20 66 | 69 6c 65 73 22 20 28 4d |flict' f|iles" (M|
|000014f0| 45 52 47 45 44 20 43 4f | 4e 46 4c 49 43 54 29 20 |ERGED CO|NFLICT) |
|00001500| 63 76 73 2d 66 69 6c 65 | 69 6e 66 6f 2d 3e 62 61 |cvs-file|info->ba|
|00001510| 73 65 2d 72 65 76 69 73 | 69 6f 6e 20 65 64 69 66 |se-revis|ion edif|
|00001520| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |f-merge-|buffers-|
|00001530| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 66 69 |with-anc|estor fi|
|00001540| 6e 64 2d 66 69 6c 65 2d | 6e 6f 73 65 6c 65 63 74 |nd-file-|noselect|
|00001550| 20 63 76 73 2d 66 69 6c | 65 69 6e 66 6f 2d 3e 62 | cvs-fil|einfo->b|
|00001560| 61 63 6b 75 70 2d 66 69 | 6c 65 20 65 64 69 66 66 |ackup-fi|le ediff|
|00001570| 2d 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |-merge-r|evisions|
|00001580| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 4d |-with-an|cestor M|
|00001590| 4f 44 49 46 49 45 44 20 | 65 64 69 66 66 2d 6d 65 |ODIFIED |ediff-me|
|000015a0| 72 67 65 2d 62 75 66 66 | 65 72 73 20 63 76 73 2d |rge-buff|ers cvs-|
|000015b0| 66 69 6c 65 69 6e 66 6f | 2d 3e 66 75 6c 6c 2d 70 |fileinfo|->full-p|
|000015c0| 61 74 68 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ath edif|f-merge-|
|000015d0| 72 65 76 69 73 69 6f 6e | 73 20 64 65 6c 65 74 65 |revision|s delete|
|000015e0| 2d 66 69 6c 65 5d 20 36 | 5d 29 0a 28 70 72 6f 76 |-file] 6|]).(prov|
|000015f0| 69 64 65 20 28 71 75 6f | 74 65 20 65 64 69 66 66 |ide (quo|te ediff|
|00001600| 2d 76 65 72 73 29 29 0a |                         |-vers)).|        |
+--------+-------------------------+-------------------------+--------+--------+